From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 24 Oct 2010 21:37:38 +0000 (-0400)
Subject: Merge changes from emacs-23 branch.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5960
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=524b0605731955d8fc813524ac8fa4b3acb02369;p=emacs.git

Merge changes from emacs-23 branch.
---

524b0605731955d8fc813524ac8fa4b3acb02369
diff --cc src/ChangeLog
index e5d66491832,7f15565f13f..902f28209ef
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,14 +1,14 @@@
+ 2010-10-24  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* xterm.c (x_connection_closed): Kill Emacs unconditionally.
+ 
 -2010-10-22  Eli Zaretskii  <eliz@gnu.org>
++2010-10-24  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* frame.c (Fframep, Fwindow_system): Deprecate use as a predicate.
+ 
+ 	* dispnew.c (syms_of_display) <initial-window-system, window-system>:
+ 	Deprecate use as a boolean flag.
+ 
  2010-10-24  Jim Meyering  <jim@meyering.net>
  
  	* emacs.c (argmatch): Don't treat "--" as "--chdir".